Merge from mainline.
authorPaul Eggert <eggert@cs.ucla.edu>
Fri, 7 Jan 2011 19:29:06 +0000 (11:29 -0800)
committerPaul Eggert <eggert@cs.ucla.edu>
Fri, 7 Jan 2011 19:29:06 +0000 (11:29 -0800)

Trivial merge